(decode_options): -t implies -c.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9bb80585f47ed776fed8ffc60183c9ce0a66b932..62c6b6766aa01d49c7cc2d46dd64ad16eb7086fb 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacsclient.c (decode_options): -t implies -c.
+
 2007-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacsclient.c (DIRECTORY_SEP, IS_DIRECTORY_SEP, IS_DEVICE_SEP)

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 4788c010bf8f77f7b2301b52be29d3ee798014ec..02935941b02a2bf67ce1e6cff8f23290f4772abb 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -436,6 +436,7 @@ decode_options (argc, argv)
 
         case 't':
           tty = 1;
+         current_frame = 0;
           break;
 
         case 'c':